Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Sep 15, 2021

Update the test server link that was updated in the English documentation
(colombia.rst) in the Spanish version as well (colombia_ES.rst).

Remove the incorrect link to the production server (which was a duplicate
of the test link instead) to be consistent with other versions of the
document.

Forward-Port-Of: #1130

@robodoo
Copy link
Collaborator

robodoo commented Sep 15, 2021

@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 15, 2021

Ping @raf-odoo, @Feyensv cherrypicking of pull request #1130 failed.

stderr:

11:42:17.087973 git.c:344               trace: built-in: git cherry-pick 3858b60f0c665cf7fd73c7279c5d828875da0200
error: could not apply 3858b60f... [FIX] app/accounting: Fix outdated Colombian test server url (Spanish)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

Update the test server link that was updated in the English documentation
(colombia.rst) in the Spanish version as well (colombia_ES.rst).

Remove the incorrect link to the production server (which was a duplicate
of the test link instead) to be consistent with other versions of the
document.

X-original-commit: ad36915
@raf-odoo raf-odoo force-pushed the 13.0-12.0-correct-colombian-test-servers-in-spanish-raf-fsJ3-fw branch from 530fde0 to c5a321b Compare September 15, 2021 10:24
@raf-odoo
Copy link
Contributor

The conflict happened because the file was moved to a different location and its contents were too different.

@raf-odoo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Sep 15, 2021
Update the test server link that was updated in the English documentation
(colombia.rst) in the Spanish version as well (colombia_ES.rst).

Remove the incorrect link to the production server (which was a duplicate
of the test link instead) to be consistent with other versions of the
document.

closes #1144

X-original-commit: ad36915
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
Signed-off-by: Raf Geens <raf-odoo@users.noreply.github.com>
@robodoo robodoo closed this Sep 15, 2021
@robodoo robodoo temporarily deployed to merge September 15, 2021 10:32 Inactive
@fw-bot fw-bot deleted the 13.0-12.0-correct-colombian-test-servers-in-spanish-raf-fsJ3-fw branch September 29, 2021 10:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants